From c734febca41ef078c754f1a1ad16718b8a511883 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 17 Feb 2017 01:30:30 +0000 Subject: [PATCH] ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419 The old board code for the TS419 assigns MPP pins 15 and 16 as SATA activity signals (and none as SATA presence signals). Currently the device tree assigns the SoC's default pinmux groups for SATA, which conflict with the second Ethernet port. Reported-by: gmbh@gazeta.pl Tested-by: gmbh@gazeta.pl References: https://bugs.debian.org/855017 Cc: stable@vger.kernel.org # 3.15+ Fixes: 934b524b3f49 ("ARM: Kirkwood: Add DT description of QNAP 419") Signed-off-by: Ben Hutchings Gbp-Pq: Topic bugfix/arm Gbp-Pq: Name arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch --- arch/arm/boot/dts/kirkwood-ts419.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi index 02bd5376270..532506cb0f4 100644 --- a/arch/arm/boot/dts/kirkwood-ts419.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi @@ -73,3 +73,11 @@ phy-handle = <ðphy1>; }; }; + +&pmx_sata0 { + marvell,pins = "mpp15"; +}; + +&pmx_sata1 { + marvell,pins = "mpp16"; +}; -- 2.30.2